From: Jasper St. Pierre Date: Tue, 5 Jun 2012 14:58:25 +0000 (-0400) Subject: data: Actually substitute @GETTEXT_PACKAGE@ in schema files X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6497 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b79d17332ee2622e562045dcacd985b9dfdf155a;p=gnome-shell.git data: Actually substitute @GETTEXT_PACKAGE@ in schema files https://bugzilla.gnome.org/show_bug.cgi?id=677497 --- diff --git a/data/Makefile.am b/data/Makefile.am index 4803081e8..67d858ee8 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -56,6 +56,11 @@ dist_theme_DATA = \ gsettings_SCHEMAS = org.gnome.shell.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ + +%.gschema.xml.in: %.gschema.xml.in.in Makefile + $(AM_V_GEN) sed -e 's|@GETTEXT_PACKAGE[@]|$(GETTEXT_PACKAGE)|g' \ + $< > $@ || rm $@ + @GSETTINGS_RULES@ # We need to compile schemas at make time @@ -80,12 +85,13 @@ EXTRA_DIST = \ $(menu_DATA) \ $(shaders_DATA) \ $(convert_DATA) \ - org.gnome.shell.gschema.xml.in + org.gnome.shell.gschema.xml.in.in CLEANFILES = \ gnome-shell.desktop.in \ gnome-shell-extension-prefs.in \ $(desktop_DATA) \ $(gsettings_SCHEMAS) \ - gschemas.compiled - + gschemas.compiled \ + org.gnome.shell.gschema.valid \ + org.gnome.shell.gschema.xml.in diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in deleted file mode 100644 index db23edac1..000000000 --- a/data/org.gnome.shell.gschema.xml.in +++ /dev/null @@ -1,210 +0,0 @@ - - - - true - <_summary> - Enable internal tools useful for developers and testers from Alt-F2 - - <_description> - Allows access to internal debugging and monitoring tools - using the Alt-F2 dialog. - - - - [] - <_summary>Uuids of extensions to enable - <_description> - GNOME Shell extensions have a uuid property; this key lists extensions - which should be loaded. Any extension that wants to be loaded needs - to be in this list. You can also manipulate this list with the - EnableExtension and DisableExtension DBus methods on org.gnome.Shell. - - - - true - <_summary>Whether to collect stats about applications usage - <_description> - The shell normally monitors active applications in order to present - the most used ones (e.g. in launchers). While this data will be - kept private, you may want to disable this for privacy reasons. - Please note that doing so won't remove already saved data. - - - - [ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ] - <_summary>List of desktop file IDs for favorite applications - <_description> - The applications corresponding to these identifiers - will be displayed in the favorites area. - - - - [] - <_summary>disabled OpenSearch providers - - - [] - <_summary>History for command (Alt-F2) dialog - - - [] - <_summary>History for the looking glass dialog - - - 1 - <_summary>Internally used to store the last IM presence explicitly set by the user. The -value here is from the TpConnectionPresenceType enumeration. - - - 0 - <_summary>Internally used to store the last session presence status for the user. The -value here is from the GsmPresenceStatus enumeration. - - - - - - - - - - - false - <_summary>Show the week date in the calendar - <_description> - If true, display the ISO week date in the calendar. - - - - - - - ["<Super>F10"] - <_summary>Keybinding to open the application menu - <_description> - Keybinding to open the application menu. - - - - r']]]> - <_summary>Keybinding to toggle the screen recorder - <_description> - Keybinding to start/stop the builtin screen recorder. - - - - - - - 'touch' - <_summary>Which keyboard to use - <_description> - The type of keyboard to use. - - - - - - - false - <_summary>Show time with seconds - <_description> - If true, display seconds in time. - - - - false - <_summary>Show date in clock - <_description> - If true, display date in the clock, in addition to time. - - - - - - - 30 - <_summary>Framerate used for recording screencasts. - <_description> - The framerate of the resulting screencast recordered - by GNOME Shell's screencast recorder in frames-per-second. - - - - '' - <_summary>The gstreamer pipeline used to encode the screencast - <_description> - Sets the GStreamer pipeline used to encode recordings. - It follows the syntax used for gst-launch. The pipeline should have - an unconnected sink pad where the recorded video is recorded. It will - normally have a unconnected source pad; output from that pad - will be written into the output file. However the pipeline can also - take care of its own output - this might be used to send the output - to an icecast server via shout2send or similar. When unset or set - to an empty value, the default pipeline will be used. This is currently - 'vp8enc quality=8 speed=6 threads=%T ! queue ! webmmux' - and records to WEBM using the VP8 codec. %T is used as a placeholder - for a guess at the optimal thread count on the system. - - - - 'webm' - <_summary>File extension used for storing the screencast - <_description> - The filename for recorded screencasts will be a unique filename - based on the current date, and use this extension. It should be - changed when recording to a different container format. - - - - - - - true - Attach modal dialog to the parent window - - This key overrides the key in org.gnome.mutter when running - GNOME Shell. - - - - - ":close" - Arrangement of buttons on the titlebar - - This key overrides the key in org.gnome.desktop.wm.preferences when - running GNOME Shell. - - - - - true - Enable edge tiling when dropping windows on screen edges - - This key overrides the key in org.gnome.mutter when running GNOME Shell. - - - - - true - Workspaces are managed dynamically - - This key overrides the key in org.gnome.mutter when running GNOME Shell. - - - - - true - Workspaces only on primary monitor - - This key overrides the key in org.gnome.mutter when running GNOME Shell. - - - - diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in new file mode 100644 index 000000000..db23edac1 --- /dev/null +++ b/data/org.gnome.shell.gschema.xml.in.in @@ -0,0 +1,210 @@ + + + + true + <_summary> + Enable internal tools useful for developers and testers from Alt-F2 + + <_description> + Allows access to internal debugging and monitoring tools + using the Alt-F2 dialog. + + + + [] + <_summary>Uuids of extensions to enable + <_description> + GNOME Shell extensions have a uuid property; this key lists extensions + which should be loaded. Any extension that wants to be loaded needs + to be in this list. You can also manipulate this list with the + EnableExtension and DisableExtension DBus methods on org.gnome.Shell. + + + + true + <_summary>Whether to collect stats about applications usage + <_description> + The shell normally monitors active applications in order to present + the most used ones (e.g. in launchers). While this data will be + kept private, you may want to disable this for privacy reasons. + Please note that doing so won't remove already saved data. + + + + [ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ] + <_summary>List of desktop file IDs for favorite applications + <_description> + The applications corresponding to these identifiers + will be displayed in the favorites area. + + + + [] + <_summary>disabled OpenSearch providers + + + [] + <_summary>History for command (Alt-F2) dialog + + + [] + <_summary>History for the looking glass dialog + + + 1 + <_summary>Internally used to store the last IM presence explicitly set by the user. The +value here is from the TpConnectionPresenceType enumeration. + + + 0 + <_summary>Internally used to store the last session presence status for the user. The +value here is from the GsmPresenceStatus enumeration. + + + + + + + + + + + false + <_summary>Show the week date in the calendar + <_description> + If true, display the ISO week date in the calendar. + + + + + + + ["<Super>F10"] + <_summary>Keybinding to open the application menu + <_description> + Keybinding to open the application menu. + + + + r']]]> + <_summary>Keybinding to toggle the screen recorder + <_description> + Keybinding to start/stop the builtin screen recorder. + + + + + + + 'touch' + <_summary>Which keyboard to use + <_description> + The type of keyboard to use. + + + + + + + false + <_summary>Show time with seconds + <_description> + If true, display seconds in time. + + + + false + <_summary>Show date in clock + <_description> + If true, display date in the clock, in addition to time. + + + + + + + 30 + <_summary>Framerate used for recording screencasts. + <_description> + The framerate of the resulting screencast recordered + by GNOME Shell's screencast recorder in frames-per-second. + + + + '' + <_summary>The gstreamer pipeline used to encode the screencast + <_description> + Sets the GStreamer pipeline used to encode recordings. + It follows the syntax used for gst-launch. The pipeline should have + an unconnected sink pad where the recorded video is recorded. It will + normally have a unconnected source pad; output from that pad + will be written into the output file. However the pipeline can also + take care of its own output - this might be used to send the output + to an icecast server via shout2send or similar. When unset or set + to an empty value, the default pipeline will be used. This is currently + 'vp8enc quality=8 speed=6 threads=%T ! queue ! webmmux' + and records to WEBM using the VP8 codec. %T is used as a placeholder + for a guess at the optimal thread count on the system. + + + + 'webm' + <_summary>File extension used for storing the screencast + <_description> + The filename for recorded screencasts will be a unique filename + based on the current date, and use this extension. It should be + changed when recording to a different container format. + + + + + + + true + Attach modal dialog to the parent window + + This key overrides the key in org.gnome.mutter when running + GNOME Shell. + + + + + ":close" + Arrangement of buttons on the titlebar + + This key overrides the key in org.gnome.desktop.wm.preferences when + running GNOME Shell. + + + + + true + Enable edge tiling when dropping windows on screen edges + + This key overrides the key in org.gnome.mutter when running GNOME Shell. + + + + + true + Workspaces are managed dynamically + + This key overrides the key in org.gnome.mutter when running GNOME Shell. + + + + + true + Workspaces only on primary monitor + + This key overrides the key in org.gnome.mutter when running GNOME Shell. + + + +